Mention the fullscreen "maximized" value in the emacs man page.

diff --git a/debian/changelog b/debian/changelog
index e6cce1430bf64f9c43e52b24826d86b904168fb1..306d3f59fa7362f82a2600c737c01ae09b513154 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+emacs23 (23.2+1-8) unstable; urgency=low
+
+  * Mention the fullscreen "maximized" value in the emacs man page.
+    Thanks to Peter Eisentraut <petere@debian.org> for the report and
+    Sven Joachim <svenjoac@gmx.de> for the patch. (closes: #594320)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sat, 11 Dec 2010 12:12:37 -0600
+
 emacs23 (23.2+1-7) unstable; urgency=low
 
   * Don't initialize the terminal twice.  Previously a console-mode

diff --git a/debian/patches/mention-maximized-in-emacs-manpage.diff b/debian/patches/mention-maximized-in-emacs-manpage.diff
new file mode 100644 (file)
index 0000000..af6cbca
--- /dev/null
+++ b/debian/patches/mention-maximized-in-emacs-manpage.diff
@@ -0,0 +1,43 @@
+* The emacs manpage now mentions the "maximized" value for fullscreen.
+  Patch: mention-maximized-in-emacs-manpage.diff
+  Provided-by: Sven Joachim <svenjoac@gmx.de>
+  Date: Wed, 25 Aug 2010 17:54:33 +0200
+  Added-by: Rob Browning <rlb@defaultvalue.org>
+  Status: incorporated upstream
+
+  The Debian patch is taken from this upstream commit:
+
+  revno: 100003
+  committer: Chong Yidong <cyd@stupidchicken.com>
+  branch nick: emacs-23
+  timestamp: Thu 2010-08-26 11:14:55 -0400
+  message:
+    * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
+
+--- a/doc/man/ChangeLog
++++ b/doc/man/ChangeLog
+@@ -1,3 +1,7 @@
++2010-08-26  Sven Joachim  <svenjoac@gmx.de>
++
++      * emacs.1: Mention "maximized" value for the "fullscreen" X resource.
++
+ 2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * Version 23.2 released.
+--- a/doc/man/emacs.1
++++ b/doc/man/emacs.1
+@@ -403,11 +403,12 @@
+ The desired fullscreen size.
+ The value can be one of
+ .IR fullboth ,
++.IR maximized ,
+ .IR fullwidth ,
+ or
+ .IR fullheight ,
+-which correspond to the command-line options `\-fs', `\-fw', and
+-`\-fh', respectively.
++which correspond to the command-line options `\-fs', `-mm', `\-fw',
++and `\-fh', respectively.
+ Note that this applies to the initial frame only.
+ .TP
+ .BR geometry " (class " Geometry )

diff --git a/debian/patches/series b/debian/patches/series
index e1754377a07ef00212f745a7103685fe68df9235..abd00ae0f5dcaf07be7625b53c73ca075efc0fec 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ fix-gnus-output-to-mail-with-live-rmail-buffers.diff
 fix-fc-dual-font-width-calculation.diff
 do-not-initialize-terminal-twice.diff
 fix-epg-digest-algorithm-alist.diff
+mention-maximized-in-emacs-manpage.diff